From 284af5af691ea42621f7dc544d6b02821b758d77 Mon Sep 17 00:00:00 2001 From: Johan Dahlin Date: Sun, 6 Jan 2008 02:18:38 +0000 Subject: [PATCH] Make sure that --root works for toplevel widgets. (#491847, Phil Lello) 2008-01-06 Johan Dahlin * gtk/gtk-builder-convert (GtkBuilderConverter._strip_root): Make sure that --root works for toplevel widgets. (#491847, Phil Lello) svn path=/trunk/; revision=19309 --- ChangeLog | 6 ++++++ gtk/gtk-builder-convert | 5 ----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 01a7214ffa..019bcb0e68 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-01-06 Johan Dahlin + + * gtk/gtk-builder-convert (GtkBuilderConverter._strip_root): + Make sure that --root works for toplevel widgets. + (#491847, Phil Lello) + 2008-01-05 Johan Dahlin * modules/other/gail/tests/Makefile.am: Include Makefile.decl, diff --git a/gtk/gtk-builder-convert b/gtk/gtk-builder-convert index f2a94098a5..8e5d0892a2 100755 --- a/gtk/gtk-builder-convert +++ b/gtk/gtk-builder-convert @@ -597,16 +597,11 @@ class GtkBuilderConverter(object): raise SystemExit("Could not find an object called `%s'" % ( root_name)) - # If it's already a root object, don't do anything - if widget.parentNode is self._interface: - return - for child in self._interface.childNodes[:]: if child.nodeType != Node.ELEMENT_NODE: continue child.parentNode.removeChild(child) - widget.parentNode.removeChild(widget) self._interface.appendChild(widget) -- 2.30.2